Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 Jan 2012 20:23:37 +0000 (12:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 Jan 2012 20:23:37 +0000 (12:23 -0800)

Trivial merge